add patch to include localcharset.h correctly

diff --git a/debian/changelog b/debian/changelog
index 264e145d28bf27a5a641f3c6d53acff6f95fae5b..bf82a5b1f83e501827ca9c3c6ae09cc47644b175 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ dcmtk (3.6.1~20170228-1) unstable; urgency=medium
        - correctly enable ICONV, Closes: #701802
        - enable C++11 build 
   * d/control:  add libunistring-dev
+  * d/p/: Add localcharset-include.patch to corretly include 
+    localcharset.h
 
  -- Gert Wollny <gewo@debian.org>  Tue, 20 Jun 2017 18:58:39 +0000
 

diff --git a/debian/patches/localcharset-include.patch b/debian/patches/localcharset-include.patch
new file mode 100644 (file)
index 0000000..8590a90
--- /dev/null
+++ b/debian/patches/localcharset-include.patch
@@ -0,0 +1,11 @@
+--- a/ofstd/libsrc/ofchrenc.cc
++++ b/ofstd/libsrc/ofchrenc.cc
+@@ -288,7 +288,7 @@
+ 
+ #include <iconv.h>
+ #ifdef WITH_LIBICONV
+-#include <localcharset.h>
++#include <unistring/localcharset.h>
+ #endif
+ 
+ #define ILLEGAL_DESCRIPTOR     OFreinterpret_cast(iconv_t, -1)

diff --git a/debian/patches/series b/debian/patches/series
index ab7e6efe140d272008ab433c4f487c0b1ff3d435..59fd29289406cb165e6e4c46b4226ef150069825 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@
 07_dont_export_all_executables.patch
 08_remove_system_processor.patch
 
+localcharset-include.patch